Changing directories to JS
Merge develop into migrate