Turned into a multi-module Maven project