Cleaned up single files and put into proper folders