Re-factoring for code gen
XML Improved
GUI Introduced