refactoring and structuring folders