Re-designed project to make it modular with OSGi and Spring.