Re-organized js dist