introduced spring to testing; renamed packages