Restructure stuff.