Moved to multiple module project so samples are built