Move unit-tests to proper subdirectories