Starting to implement Mock
Packet rename
Hiding classes that shouldn't be available to the client