Finish getting initial files right