Minor refactor - moving files around/adjusting namespaces.
Validation modifications.