Merge "Refactor radio folder for 1.0 and 1.1"