recover test directory
restructure the directories under server/