reworked file structure for class conj