renaming file and folder, cleaning up code

as packagist "asked" for it;)