altered server file tree & more stuff on #10 & #3