organize files
move times to data and adapt tests
move times to data
data
app
time
decrease line length
fix tests for app, time, data
closures