Convert to Maven Project, And create unit tests