* [FIX] Various fixes, mostly module/project restructuring.