More restructuring and renaming.

Removed the script files; I will add these back later.