Move overlay stuff to common and fix mass storage