Major re-organization of modules. Should work better now.