Use separate files for layer definitions and hero options
Merge pull request #920 from igorko/master

Use separate files for layer definitions and hero options