Move classes around to follow the same structure
Update docs