Improve targets menu

If there are many targets in a directory, add a subdirectory. Otherwise
it would create huge menus that wouldn't even fit my screen in some cases,
this should make it a bit better.
Make sure everything has been sorted.