move views and remove testing code