- Bugfixes
- Restructured for composer