Moved Things Around for Composer
Modified Namspacing