Reorganization

Change-Id: I10eb648e13989fd2d8a268150eae14dcb5b8e4e8
Reviewed-on: https://pirx.atteo.com/gerrit/601
Tested-by: Mr. Jenkins
Reviewed-by: Sławek Piotrowski <sentinel@atteo.com>