Remove unused and rename files