Initial Commit
Moved files to folders
Edited index file
Merged from branch develop