cleanup header and rename many files