If I'm not mistaken, Flash started out as a plug-in called FutureSplash. Shockwave/Director were different applications. Macromedia purchased FutureSplash, and Flash was born out of that.
Both Flash & Shockwave are vector-based animation packages, however Flash is designed primarily for use on the web. Therefore, Shockwave is far more powerful, and includes far more features than Flash.