Moving plugins to their own dir
Moving testing out to its own module
Fix requires