Modified git layout