Moving things around... a lot\!
Fixing package/module setup.