Clean up. Change namespace and removed unused classes