Restructure

Adjusting structure of the branches