Cleaned up routing package and introduced internal package