restructured packages/modules, cleaned up imports