Added watchdog, folder organization.