Restructured git repo