Move client files, add collection definitions