Organized files between development and master
Modified files on master
Removed more development files