Refactoring(folder structure)