Re-organised everything