Add return statement to animate function

(Even though it should never return)
Reorganize files
Remove trailing whitespace
Minor Makefile changes