Moved to maven, add client side code