Restructure infinisink