Extracted as separate modules and all dependencies on am.mdzip removed