Made a basic form, reorganized

Realized we're on our way to a high fidelity prototype, and we don't
want that yet.
Took what we had, and moved it somewhere else for later.