removed server
changed directory structure