Change make names for simplest makefiles
Move plug in up