Moved from skin/js to js