• Change output file locations to their proper layout, fix missing semicolons Jul 2