Move modules into lib/