Better code organization

CI approach