renamed and moved views