refactored to separate datasource, parsingrules and 'added rules' from map
added placement strategy to map
version 0.0.4
Merge remote-tracking branch 'upstream/master'