handlers: Moved some files