Add composer json
Refactoring to namespace