Reorder dependencies for core module