changed structure of the project, formatted code