Cleaner code.

Replacing the old craft entities.