Major restructuring and cleanup (tk, cljx, reloaded)