reworked repository structure