Modman, composer support + small code cleanup