Refacturing, Most functions moved to Helper engine Library