Changed the scaffolding of the project at bit