refactor directory / engine layout

The directory and engine layout is adding a lot of confusion. clean it up.

(from redmine: created on 2014-04-07, closed on 2014-04-17)