cleaned up directory; renamed files