Revert "split things into components"

This reverts commit 3ad7de822fb592cca6b215e8b1b270d467a61780.
cleaning up input and attack ai