Cleanup to git structure
Cleanup to git structure part 2