Reorganize for new version