moved stuff into AMD Modules