Some updates, directory renaming, and non-general scripts due to laziness.