Move plugins into sub-packages