regenerated classes and restructured folders

regenerated classes with changes to utility