Restructure plugin layout