Adapting layout to new Git structure