fix makefile, separate out included modules
Separate out plugins into their own source tree.