Refactored network addresses, removed irrelevent files, cleaned up