Split up files
+ moar defs
+ formatting