Restructure and splash screen