Move css and js files to different folders
Remove unused files
Merge remote-tracking branch 'origin/Develop' into Develop