Moved WindowManager to the proper place