- Implemented two different datatypes to store interface information
- Broke out more code into separate files