Refactoring module.  Added Device and Interface classes
Cleanup of header comments