Totally move things around to make conventional to composer