Adding amd to modules.
Renamed modules with hyphens to use camel.