Restructure a bit and add preliminary Invoices / Subscritions