More restructuring for CkaePHP 2.0
Changed the refrences to files which names have been changed to comply
with Cakphp2.0 and PSR