Changed to correct package directory structure to use with [setup.py]