Fix some out of place files