moved things around to get rid of metapackage