Restructure of YAZ source