Merge "Move widget files into widget folder + add tests." into sc-dev