Renamed and moved some .js files