reworked directory structure in the repo