refactoring - align to organic logic