Remove dto from package name which is buggy with npm
Re-indent main file (and remove //} comments)