refactoring modules for 0.1.0 version.