OMX fix and overall reorganisation for CM11