#5 Remove core package from client

[Mike Heath]

We need to remove the core package from the client
module and merge it in with the core module.