Buildable

Cleaned up all namespace issues.