Add client code and reorganize sources