Modify sample directory to conform with new structure