changed alias for consistency
moved sourcing files towards the end