Merge "Fixed project structure errors that broke build"