Re-ordered to help python imports to work