#master: Move some view files