reworked directory tree