updated organization and tests