60 Refactoring plugin structures and add apps plugin