move javascript file to js folder, plsu other improvements