Refactor Parser for readability and maintainability and add test
Update build file with additional demos
One should not hurry a configuration update