Moved client stuff into shared

There's a hard limit on client files, best to keep to just shared.