Hakan's refactor to fix the client

All java related work is brought here to be built using maven from the
client. The code will move to a new repository