Rearranged folder structure to use root