Switched to Maven and added unit tests