Overriding master branch with the new layout