Restructured for npm