Restructuring and cartalyst/sentry integration