Moves files to Widgets folder instead Widget and made the layout