Renames timeline_ajax -> ajax, timeline_js -> js.
Merge commit '1c7135f15fdd34d070b263abe94c3f408d3d3308'
Merges in renamed directories.