package refactoring

remove some needless cluttering from configurations and fix the distribution