Refactory full
- Added Composer support