reorg - to work around webstorm/npm link bug