major organizational refactor