fix #pop problem
fix stack after refactors
change node folder structure