add simple fire/handle demo fragment
renamed some helper classes
some refactoring work