changed directory structure to match new server setup