m + doing wild things to the file hierarchy

Signed-off-by: Mattias Andrée <maandree@operamail.com>