moved package from demo to java