Use separate files for layer definitions and hero options

For issue #912.