Refactor code to fit new infintibeat-lib and styletrip_engine JAR