Major overhaul of the folder structure to better align with the logical
areas of functionallity