Renamed
Configuration moved to dedicated file
Added optimist