fixing way exporting stuff. removed extra level of module encapsulation ...

...re: reem