Improve Header and File Layout