Merged master branch and removed old files.