removed overly complicated package structure