redoing directory structure for packaging