move views into appropriate package