Reorganizing features.
Fixing scripts.