Split off demo classes into seperate package