Refactored files
Removed old file
Refactored