Big Restructuring

Restructured to fall in line with the normal gem structure.