Restructured JS files