Folder Cleanups

Cleaned up the higher level struct a bit and added the new v2 schematics