Merge pull request #2 from jr-news/master

changed folder structure