Refactor and add neapp