Add wrapper for scanning and move functions to lib/