Moved common files to generic package