A lot of tests passing now. On to the build updates.
Move var declarations to var folders (for explicit building)