flattened package to module and updated setup and tests