Reorganized git structure