Minor refactoring

Fixed packages