reworked dir structure