node files refactoring and further development