Fixed history options
Moving aliases to separate file
Moved out aliases in separate file