I would recommend that you organize your apps, then right click on the desktop and then click on view, and then on align icons to grid. THis allows you to have all your app shortcuts organised, but then have your docs aligned too.
Download it here!
|My desktop with the wallpaper|
Image from here.