moved modules into own package(lib)