re-organized source files for conjugates
re-organized tests for conjuates-normal