Scale/logic refactor
import path error fix
Merge pull request #492 from nortikin/scale_logic_refactor

Scale logic refactor