Code is messy

[twetzel59]

Craft code is mostly in main.c, which makes improvements difficult.

[twetzel59]

Code needs to be put in its own files