refactoring project file organization