Moved module files into ./lib