Moved things around for consistency
Merge branch 'master' into HEAD
Moving things to a new layout