Refactor and remove views directory