Re-arrange js import