regenerated classes and restructured folders