Refactoring for better file/code management