Simplify module again

Don't need the hijinks now that it's in it's own file.