changed project structure for setuptools support
Merge branch 'feature/setuptools' into develop

Conflicts:
	.gitignore