3.0 restructure