Benchmarks API/model/view/controller + a bit of refactoring and deleting unused files