Fix view issues
Changing Directory Structure