major reorganization of directory structure

Reorganized directory structure for better compatibility with PyPi