Refactor to only call getDuration()
Restructure codebase
Now can add routes and list them back.