Changed names and removed unnecessary files