Folder Architecture Overhaul Start

Starting to overhaul the folder architecture.