Fix: get the new subpackages working
New: break up the core a bit more
New: break up core some more, flatten hierarchy