Fixed namespace and composer loader