Made the structure more npm friendly.