Moved common stuff to the common project and fixed mixed code issues