Cleaning up

Cleaned up directories, organization, and removed some old scripts.