refactor the assembly/RAD package