reworked directory structure again...