Plugin to Module refactoring