reorganize directory structure and get ready to test