Restructure startup