- Rollback of change to have Grid View in Portrait to build on other features
- Renamed some files to make their purpose easier to understand