Major update of project structure

Update of project structure, making it similar to others in the user profile. Minor version number has been increased to 10 just to make it clear the number of modifications the repository has undergo to reach current state.