Fixed package naming to have demo in the namespace and updated all classes with the new package name
Updated license statements to reflect current year