Refactoring of source folders