Rearranged folder structure so that projects are top-level