I did not want these to be submodules
Re-add audio, media, display-legacy