Namespace adjustments

Adjusting namespace and arranging files to reflect it.