Update structure a bit
npm refactoring