refactor
add new aliases
Update some paths and refactor some stuff