adding new directories and some more server code
OOPSed my code
fixed some conflicts