Removed unused fileas and renamed