changes for allowing both for laravel and non-laravel projects