[master] Move demo app into a subfolder, adapt config files and tests