moved aliases and functions to their own file.

Improved naming convention, better organized