Internal Restructure

Internal Restructure