Cleaned up irrelevant files for master layout
Moved code into master layout