Project2 submission

Changed some folder names, etc. Ready to upload