changed the layout of the project for better compliance with conventions