am 0b0d9d40: Merge "Refactoring folder content" into ub-launcher3-burnaby

* commit '0b0d9d40ee055e166235e0e68141a3c06f8d0e94':
  Refactoring folder content