Moving files to subpackages to accomodate extra demo classes for other talk
restore unused imports