Finished Renaming
Added AWS classes and fixed some refactoring bugs