Moved include files into 'tasks' subfolders

Corrected the structure of the include files by placing them in subfolders.