heavy architectural refactoring
view paths and files reorganized and refactored