Fix imports and module names for new hierarchy