Re #10674 minor niceness
Re #10803 Just moved all direct into separate folder

And all seems works fine.
Merge branch 'feature/10803_DirectInelasticPack' into develop