tooling note for organize by feature