fix class strcuture