Changed namespaces for better organization