Refactoring: Move some strategies out of strategies.-Packages