Restructured; I can actually read errors now
Boilerplate, begone