removed seperate chart packages and moved everything into chart package