Changed dir structure, unittests, stub export