asset tracking updates and restructure

@jamie-cyber
@mmeisinger please review