Restructure the exceptions again
Fix internal ds and controller typedef from the latest changes