Final restructuring before coffee-scipt curse upon us