Reorganize test directory structure, simplify build tasks