Moving stuff around to make a composer package of this