Fix versions for node modules
File hierarchy reorganization