Relaxed time ranges to cater for slower execution on Travis, Refactored package structure
Refactored package structure