Refactored the project skeleton