Changed app sub-folder paths to remove spaces
Merge branch 'remove-path-spaces'