Separation of code into modules to facilitate new developments
Fix import