Moved stuff around in lib/module