Moved /modules to /lib and completed issue #25