Refactored scalate package