Updating master with missed merge files, class directory

Signed-off-by: Steven Sheeley <steven.sheeley@gmail.com>