Reorganize into atomic tasks