refactors widget folders to reduce nesting