1.0 restructure