Move presenters to new class & update some files