Restructure stuffs