updated organization and class structure