Restructured module for compatibility with setuptools