Refactored views file structure
Refactored test file hierarchy