mk808/mk3066-common: Another cleanup, put things where they belong and some fixing.