Fixing project structure for pypi upload