Changed the structure to get ready for packagist