moved subdirs out of trunk for ramona branch