* commit 'c95169f0':
  build: Move cli tool sources to a separate subdirectory
Merged-by: James Almer <jamrial@gmail.com>