move stuff into client folder for client