Merged main and cards controllers, and hoisted cards up to the root