Major refactor and removal of extra structs for each part of net. Updated tests to reflect changes.