Restructuring with new application name