Merge pull request #1 from jr-news/master

changed folder structure