Proper organization for castle