Refactoring filestructure. Adding filestructure to project