Restructure console