Renamed files to be consistent between server and client, refactored client-side files