Refactor to Zend naming convention for file names. Remove unused folder.