Add remaining folder structures. HACK HACK HACK