Restructuring into Maven format.
Merge branch 'master' of https://github.com/michaelpidde/test-flow

Conflicts:
	README