Set-up packages and refactored names