refactored directory structure as part of migration to python 3
and works better with nose tests.