Arranged directory structure to have a better organization of the files