refactor organization