ContentPipeline

Fixed up all directory issues and added ContentPipeline to all recent
Changes