Moved files to generic package