Organize the project code

Branches that include this commit at the time of last fetch