Re-arranged scripts. Cleaned up scripts.