restructure tasks