Updated and moved files to v3.0 PR1