Reorganized file, added folds.