Flatten directories, add directory for tests