reorganizing and adds fronted server