Move the plugins to seperate files and add DoPlugin