Reorganise slightly and update skills