put magic numbers into vars
removed server files and reorganized