Changes

Restructures the project files
In order to get all the team members the same structure of files in the 
project, all files are refactored to match with Intellij Idea code style