Removed 'Core' from the 'Acms' namespace. Made appropriate changes where needed.