Moved things around to better handle the composer loading style