(from redmine: issue id 2891, created on 2013-11-29, closed on 2014-02-03)
Fixes: #2891 move code into the correct directories