Restructure commit two