moved to shell, composer file, cleanup