Reorgainzing content.
More reorganizing.
Adding Comp