Some folder refactoring