Merge "Fix project structure." into studio-1.3-dev