Update directory layout to keep differnt sources authored by Rico Bergmann's avatar Rico Bergmann