bump version to 0.5.2
bump version to 0.5.3
improve folder names and responsibilities
Merge branch 'hotfix/0.5.3'

* hotfix/0.5.3:
  improve folder names and responsibilities
  bump version to 0.5.3
  bump version to 0.5.2