Moved files
Naming of flavours changed