Cleaned up comments
Changed files around to clean and organize directories