Update File Structure, clean up headers