Starting to consider refactoring to the default organization