start to bring in line with packaging format
make it all packagey