Removing legacy code, changign amazon-bundle to a semantic configuration and service provider bundle for AWS