Sorted out plugin packaging