added __server folder 2