Big cleanup of the include tree, removals of old and unnecessary code and moving files to their correct module directories