Refactor filenames and locations #2
Merge origin/develop into develop