Removed unnecessary code
Rename files