Doing some clean up to make things easier to find.
Moving all Handlers in the Handlers Folders and Objects in Objects Folder.