Some symlinks and cleanup for 3.0.0