Modified directory structure, more folders to come soon