Rearranged buffer classes
Further simplified app