Fixing space urls.
Cleanup and simplification of framework.