clean up of buildsystem file
test clean up
code reorganization