renamed file, minor refactor
Removed old file