Rework project arborescence
Merge branch 'master' of https://github.com/eledhwen/modulator

Conflicts:
	out/artifacts/modulator_jar/modulator.jar
Merge branch 'master' of https://github.com/eledhwen/modulator