rearranged files and have test for leap year