Cleanup, handle nested folder watching