Shuffle things around
Update references
Add placeholder rule