trying to figure out a nice package structure