fixes #1 moved core to client-core