Moved the daemon and the securitymonitor + small changes