changes folder-structure.
changes testing-method.