folder re-organize, user server commands added