Reorganized, but Flash still isn't working correctly.