Began to convert to Maven project