Changed folder structure
Started work on project2