File Cleanup

Changed some filenames and some organization