Composer adjustment
Namespace bugfix