Restructured js directory