Cleanup and add task1 files