Collection initiliaze cleanup
Better Task files routing