Updated source structure and added simple tests for tag parser.