folder re-organize, user server commands added
Merge remote-tracking branch 'origin/Jeanne'