Reorganized class structure, added indexes, properties, structs, usings