Cleaning up client and server for refactors
Renaming and moving into more organized structure.