Merge from 'openvix/master'
Directories fix import, TimeShift move out of InfoBarGenerics