move to new layout
Merge pull request #2 from CamShaft/master

move to new layout