Got module working with embedded packages and cleaned up file headers.