Merge "Refactor. Make the code simpler."
tree: 06e08806db05aa6ac270f9462b95cfd965ad8089
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/