Add missing directories and re-organize the folder.
Signed-off-by: Sébastien Han <seb@redhat.com>