Replaced old files with refactored