Converted to Maven project