Rearranged folder structure Thu Jan 9th