Re-organized Git Structure