Revert "Reorganized barry.h app header and record.h header"