Complete project structure porting

Also fix branches file