optimization: changing all Strategy classes to namespaces