Restructured, cleanup
Started L2 stuff
Wrote some spill tests!