Move plugin modules to their respective package; optimize imports