Move generic applications to main folder