module handling refactoring
cleanup
fixed junits