move entry and presenter away from main file