rearranged to match published CR version

Rearranged content to match published CR version
Removed much of the conditional content that was in the file this was
initially copied from.