Removing amazon modules.
New modules and gitmodule changes.