build cleanup and renamed file