organized class structure/interfaces/tests