changed dirs, late commit.
Merge pull request #5 from daveology/layout1

changed dirs, late commit.