Moved all files to the correct location.
Merge branch 'develop'