reorder manager methods and delete unnecessary files