Last commit before retiring folders.

More of original folders migrated, but not near complete/working.