refactored views directory