massive restructuring. removed package/module shenanigans. now just one big module