restructured code to prevent namespace collision when other dataware components are installed