+ moved demo to src.main.java as requested