restructure some tasks and update for trusty tauren