fixing layout and paths
Merge pull request #38 from belindahare/master

fixing layout and paths