modified folders structure, added field properties, some other