Move test site to /skeleton, more intuitive internal naming conventions, separate anonymous callbacks for better testability