reorganized source tree to accommodate for tests