Deleted unnecessery files and introduced a package-structure in the tests-dir.