CWM restructuring; support CM builds