Restructuring the js files...