Add sources
Refactoring
Add composer.json