Only cleaned up and renamed the files