Cleanup
Refactoring module paths