Split into separate files in a new namespace

Signed-off-by: Cruz Julian Bishop <cruz@techern.com>