Strategy pattern implementation, package name refactor