Revert "Structs can never contain structs"

This reverts commit f661072a40061f0aff5c676b6a2ef68019d5a683.
Revert "Complies with timer.h and should now work"

This reverts commit 1413dbacf39b6e97f97fb6df8d217f4fd2824079.