refactor file structure
refactor directories and files