Renaming and reorganizing as well as some keyboard support
media