AWS module refactoring