reorganization and general sanity