this time realy reaorderd directory schema