changing static class to namespaces