Changed File Structure in Master branch to allow seamless merging with the gh-pages branch