Aliases for cygwin; reorganized structure