Combine both js files together