Refactor directory strucutre...with the directories\!