refactoring files to relevant folders.