Organized Files into folders and changed include directives to suit the new organisation.