Cleanup
Filename bugfixes
Composer script created but not tested