begin refactoring Strategy out where un-needed

- packages renamed
- classes renamed
refactor Strategy out and package names