Fix archives
Reorganise the codes!