(cherry picked from commit 35a9ec140fa6aaa215e2c61e209dac6790d5a0df)
Moving various editor files into sub folders to reduce clutter