[packaging] Return to old directory structure.

Signed-off-by: Marko Saukko <marko.saukko@jollamobile.com>