Refactor, renames, and removing req.rs for now, refs #1