Cleaned up module imports and confirmed directory pruning