1.fix an issue when extra is Null server return error 1003
2.optimize the directory structure