Finnish task 5, and start filesstructure on task 7