Moved client files into client directory