Restructured js directory
Merged