Changed directory structure in view for one easier to understand and in sync with our Java package structure.