Refactored controllers and updated aws settings