Rename files and classes to make MVP relationships clearer
Various refactorings, especially, removing references to subordinate presenters from main presenter and standardization of naming.