Refactored to package structure in FallPrevention