refactoring the folder..