- created different modules from the client

 - improved the descriptor loading and parsing
 - improved the start/stop including/excluding