Restructure, now release