Updated the clean script; renamed files