Removed unnecessary code
Added renamed files