BEMINFO-203 changed directory structure