improve framework organization and functionality