Move everything to server subdirectory
many changes