Refactored Project structure