Restructured the Scripts
Extract the Class definitions