Change project structure, prepare task2