new structure for sources
adding test system