moving aliases to separate file
fixing todo alias to be usable anywhere