Cleanups and moving stuff around, Also moved all items to New Flashy registry