Added intx, refactored file structure