Fix crates not splitting up correctly