Changed folder setup
Merge https://github.com/DevMoore94/Website