removed old style files
substituted in refactored files