clean up, starting to restructure main controller's fetch
refactored main view controller to use blocks
renamed files