class restructure parsing