moved server files into a single directory
last commit til after finals