Reorganize tasks folder
Don't reimport macros
Reorganize tasks a bit more