again reorganized stuff so setuptools works without extra configuration