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

* commit '80cd169c8e5afbf7cfd1e867711cfc8ebc75daea':
  Fix project structure.