Restructure tasks into seperate files.