Removed files, refactored names for methods