entitlement fixes
project reorg