Put files into correct places and made some test

Test aren't detailed.