File layout cleanup