Restructed sample directories