[WIP] Fix Corparate Linking Structure

https://www.pivotaltracker.com/story/show/79804602