Minor restructure 2.0