Moving the implementation to a module within lib/