Introduced sub-namespaces for all classes to be more organized