rename
refactor functions and variables into folders