Refactored plugin structure, updated Makefile