Use separate files for layer definitions and hero options

For issue #912. 
Also I have noted then when we have few hero_options files (try Polymorphable), GameStateNew is loaded with empty portrait. This should be fixed