Refactored view folder hierarchy & renamed a couple classes.