Keep all initialisation together

Signed-off-by: David Greaves <david.greaves@jollamobile.com>
Implement complex rules for .spec handling (ie optional, try to make from yaml etc)

Signed-off-by: David Greaves <david.greaves@jollamobile.com>