cleaned up files - removed unnecessary stuff, and improved organization