Add dev folder
Reduce timeouts to one overall