Restructure Legacy Form