Retabbed to catch new bad tabs

Clean up the newly introduced tabs to lib

Note that https://github.com/rapid7/metasploit-framework/pull/2306 depends on this to help resolve merge conflicts.