Restored this PR to life

- Renamed stuff to be explicit to PHPCR
- Have started system to manage nodes and forms