Moved boxes to core, modified where necessary