Adding Stucture to the Project to enable cleaner layout