reorganise deps and addon files