reworked directory structure