Recommendation is to avoid using the year nomenclature as this information is already encoded in the git repo. Avoids needing to repeatly update. Also updates AUTHORS.txt from current repo with contributor names
Separate the layer grouping classes for easier modification
Also some const& hygiene and some formatting.