Merge "Fix project structure." into studio-1.3-dev automerge: 80cd169
automerge: 90a1e09

* commit '90a1e093775bf0b5f1abb33aeda94c2e91b634ac':
  Fix project structure.