Restructure
Merge branch 'master' of https://github.com/ryon5948/sargasso

Conflicts:
	pom.xml