reworked directory tree - completed