Restructured project using Maven, and added unit tests