going on with refactorization
refactoring most of the modules.