Moved adding binaries and declaring source containers to base plugin