Change directory
Add Base module
Improve module design