Updated dependencies, consolidated areas where scripts loaded.