GJP-46: move assembly to impl modules