move federal-tier compliment classes into their respective contextual containers
add general-tier compliment containers, move general-tier compliment classes into respective containers