One more reorganization to keep everything organized in a good way