Refactor, plugin based folder structure