reorganise to match capistrano 3 preference