Refactored modules properly in plugin tree