Layer files repaired (commit 2.2)

Incorrect versions of layer files were loaded in 2.1. This version has
the final commit 2 style and backwards compatability