moved js files into js folder form assets
merging master