Moved some classes around
Added Public and Private key objects