Reworked the directory structure again