renamed module
minor fixes
refactoring
change description