removed trunk directory and moved subdirectories to 1 level upper directory