Cleaned up namespace, util exposure, src structure