Refactored module namespace
Simplified directory structure