update composer reference
Re-organize structure
Hook up service providers