Refactored module directories
Refactored module namespace
Refactored constants