(refactor): Moving to newer architecture