reorganized views directory structure