moved and renamed relevant views