removed server folder
refactored to new folder