change directories organization and add test runner