Media tidy

lots of rouge media folders, usync now tries better