Temporarily commented changes from 634135^ (merge 'improve_file_layout').

I commented these changes to have a version which is fully compatible to our latest release changes (testcase2 for instances), with no strange behaviors. This is for the most part fully equivalent to our last release (there are only a couple of improvements).