moving to a project based layout of the code