Changed views to use new structure. Move changes from scaca to AcadOowpBundle. Other changes