refactor to make usable
remove tested dirs