Files moved around
Fetcher bug fixed
Improved views