fix for latest version
change directories organization and add test runner
restructure directory structures