Rearrange folder for Packagist registration
Some edits + prep for packagist