Restructure static