Refactor Views Dir