Refactor - simple reorg of projects to fit standard layout
Merge remote-tracking branch 'ddb/master'

Conflicts:
	.project
	test/project/localUploadExample/.project