clean up package structure of strategy pattern