Also renamed directories to be more consistent. Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>