Various changes

- use _ from node_modules to link to lib folder
- restructure folders