reorgansised git structure. Now includes top level directories