Completion of desmond_parser reorganization and partial integration with kwforce branch