v1.1 restructure