changed directory layout
...