For consistency, change ADRESS1 to ADDRESS1.
Moved all layer-based content into per-layer files