Drop old TODO
Normalize package path