Unifying `pre_rec_*` and `pre_*`

Removed the `pre_rec_*` modules, and just moved the records into the corresponding `pre_*` modules.

Also, added de-duplication in the `pre_account` module, along with other minor fixes.