Simplify the directory structure and get rid of 'base' dir

Signed-off-by: Tomas Hozza <thozza@gmail.com>