Proper commonjs structure