Merge "Moving over core/api/*txt files"