Remove directories (see above)
Refactor: mediatypes