Structured in a more idiomatic npm way