diff --git a/Utilities.iml b/Utilities.iml
index 1578020..383188e 100644
--- a/Utilities.iml
+++ b/Utilities.iml
@@ -6,7 +6,7 @@
-
+
@@ -14,9 +14,11 @@
+
+
@@ -24,6 +26,7 @@
+
\ No newline at end of file
diff --git a/src/dorkbox/util/database/DB_Server.java b/src/dorkbox/util/database/DB_Server.java
deleted file mode 100644
index 2b91c0f..0000000
--- a/src/dorkbox/util/database/DB_Server.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright 2014 dorkbox, llc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dorkbox.util.database;
-
-import dorkbox.util.bytes.ByteArrayWrapper;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-
-import java.util.Arrays;
-
-public
-class DB_Server {
- /**
- * Address 0.0.0.0/32 may be used as a source address for this host on this network.
- */
- public static final ByteArrayWrapper IP_SELF = ByteArrayWrapper.wrap(new byte[] {0, 0, 0, 0});
-
- // salt + IP address is used for equals!
- private byte[] ipAddress;
- private byte[] salt;
-
- private ECPrivateKeyParameters privateKey;
- private ECPublicKeyParameters publicKey;
-
- // must have empty constructor
- public
- DB_Server() {
- }
-
- public
- byte[] getAddress() {
- if (this.ipAddress == null) {
- return null;
- }
- return this.ipAddress;
- }
-
- public
- void setAddress(byte[] ipAddress) {
- this.ipAddress = ipAddress;
- }
-
- public
- byte[] getSalt() {
- return this.salt;
- }
-
- public
- void setSalt(byte[] salt) {
- this.salt = salt;
- }
-
-
- public
- ECPrivateKeyParameters getPrivateKey() {
- return this.privateKey;
- }
-
- public
- void setPrivateKey(ECPrivateKeyParameters privateKey) {
- this.privateKey = privateKey;
- }
-
-
- public
- ECPublicKeyParameters getPublicKey() {
- return this.publicKey;
- }
-
- public
- void setPublicKey(ECPublicKeyParameters publicKey) {
- this.publicKey = publicKey;
- }
-
- @Override
- public
- int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + (this.ipAddress == null ? 0 : Arrays.hashCode(this.ipAddress));
- return result;
- }
-
- @Override
- public
- boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- DB_Server other = (DB_Server) obj;
- if (this.ipAddress == null) {
- if (other.ipAddress != null) {
- return false;
- }
- }
- else if (!Arrays.equals(this.ipAddress, other.ipAddress)) {
- return false;
- }
- return Arrays.equals(this.salt, other.salt);
- }
-
- @Override
- public
- String toString() {
- byte[] bytes = this.ipAddress;
- if (bytes != null) {
- return "DB_Server " + Arrays.toString(bytes);
- }
-
- return "DB_Server [no-ip-set]";
- }
-}
diff --git a/src/dorkbox/util/database/DatabaseStorage.java b/src/dorkbox/util/database/DatabaseStorage.java
deleted file mode 100644
index e71151b..0000000
--- a/src/dorkbox/util/database/DatabaseStorage.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2014 dorkbox, llc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dorkbox.util.database;
-
-import dorkbox.util.bytes.ByteArrayWrapper;
-
-/**
- * A list of all of the keys used by the storage database
- */
-public
-class DatabaseStorage {
- public static final ByteArrayWrapper SERVERS = ByteArrayWrapper.wrap("servers");
- public static final ByteArrayWrapper ROOT = ByteArrayWrapper.wrap("root");
- public static final ByteArrayWrapper USERS = ByteArrayWrapper.wrap("users");
- public static final ByteArrayWrapper ADMIN_HASH = ByteArrayWrapper.wrap("adminHash");
- public static final ByteArrayWrapper FILES = ByteArrayWrapper.wrap("files");
- public static final ByteArrayWrapper GENERIC = ByteArrayWrapper.wrap("generic");
-}