Changed over to Maven project