Finished organization refactoring