Refactored project file structure