overall cleanup
rm old version of the server
add better testing and clean up files
clean up folder structure
clean up folder structure