restructuring for pypi build
missed two key files on checkin